From e754720a8d1c76a4815e19b5260d8e4c4f4d1863 Mon Sep 17 00:00:00 2001 From: Anton Gladky Date: Fri, 24 Mar 2023 07:42:43 +0100 Subject: [PATCH] Update d/folder for 9.2.6 --- debian/.gitlab-ci.yml | 5 - debian/changelog | 6 + debian/control | 19 +- debian/libvtk9-dev.install | 4 +- debian/libvtk9-doc.docs | 2 +- debian/libvtk9-java.install | 4 +- debian/libvtk9-qt-dev.install | 4 +- debian/libvtk9.1-qt.lintian-overrides | 1 - debian/libvtk9.1.install | 2 - debian/libvtk9.1.lintian-overrides | 1 - ...vtk9.1-qt.install => libvtk9.2-qt.install} | 0 debian/libvtk9.2-qt.lintian-overrides | 1 + debian/libvtk9.2.install | 2 + debian/libvtk9.2.lintian-overrides | 1 + debian/patches/10_matplotlib.patch | 8 +- debian/patches/110_vtk9_netcdf.patch | 11 -- debian/patches/120_fix_shader_crash.patch | 163 ------------------ .../20_do_not_link_against_socket.patch | 6 +- debian/patches/30_drop_medical_example.patch | 8 +- debian/patches/40_vtkpython-9.patch | 6 +- .../patches/50_fix_python-modules_path.patch | 16 +- debian/patches/60_fix_path_perl.patch | 36 ++-- debian/patches/83_allow_gles_platforms.patch | 13 +- ...tTexture_no_vtkOpenGLCheckErrorMacro.patch | 6 +- debian/patches/95_java_mach-arch_fix.patch | 15 +- debian/patches/97_reproducible_builds.patch | 12 +- debian/patches/98_fix_mpi4py.py | 6 +- debian/patches/99_fix_ftbfs.patch | 6 +- debian/patches/series | 3 +- debian/python3-vtk9.install | 4 +- debian/rules | 6 +- debian/upstream/metadata | 4 +- debian/vtk9-doc.docs | 2 +- debian/vtk9.install | 4 +- 34 files changed, 112 insertions(+), 275 deletions(-) delete mode 100644 debian/.gitlab-ci.yml delete mode 100644 debian/libvtk9.1-qt.lintian-overrides delete mode 100644 debian/libvtk9.1.install delete mode 100644 debian/libvtk9.1.lintian-overrides rename debian/{libvtk9.1-qt.install => libvtk9.2-qt.install} (100%) create mode 100644 debian/libvtk9.2-qt.lintian-overrides create mode 100644 debian/libvtk9.2.install create mode 100644 debian/libvtk9.2.lintian-overrides delete mode 100644 debian/patches/120_fix_shader_crash.patch diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml deleted file mode 100644 index 91efe07d1..000000000 --- a/debian/.gitlab-ci.yml +++ /dev/null @@ -1,5 +0,0 @@ -include: - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml - -variables: - SALSA_CI_DISABLE_REPROTEST: 1 diff --git a/debian/changelog b/debian/changelog index f90cd40eb..bd843213e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vtk9 (9.2.6+dfsg1-1+exp2) experimental; urgency=medium + + * [965a45d] New upstream version 9.2.6+dfsg1 + + -- Anton Gladky Fri, 24 Mar 2023 07:42:03 +0100 + vtk9 (9.1.0+really9.1.0+dfsg2-5) unstable; urgency=medium [ Elvis Stansvik ] diff --git a/debian/control b/debian/control index 213498161..e2c2c2bfc 100644 --- a/debian/control +++ b/debian/control @@ -50,7 +50,7 @@ Build-Depends: chrpath, libproj-dev, libsqlite3-dev, libswscale-dev, - libtbb-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !alpha !ia64], + libtbb-dev [linux-any], libtheora-dev, libtiff-dev, libutfcpp-dev, @@ -77,7 +77,8 @@ Build-Depends: chrpath, x11proto-core-dev, xauth, xvfb, - zlib1g-dev + zlib1g-dev, + sqlite Standards-Version: 4.6.2 Vcs-Browser: https://salsa.debian.org/science-team/vtk9 Vcs-Git: https://salsa.debian.org/science-team/vtk9.git @@ -115,11 +116,11 @@ Depends: ${misc:Depends}, libproj-dev, libpython3-dev, libswscale-dev, - libtbb-dev [linux-any], + libtbb-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !alpha !ia64], libtheora-dev, libtiff-dev, libutfcpp-dev, - libvtk9.1 (= ${binary:Version}), + libvtk9.2 (= ${binary:Version}), libvtk9-java (= ${binary:Version}) [!hppa !hurd-any !kfreebsd-any], libx11-dev, libxft-dev, @@ -142,7 +143,7 @@ Description: VTK header files This package provides the VTK header files required to compile C++ programs that use VTK to do 3D visualisation. -Package: libvtk9.1 +Package: libvtk9.2 Architecture: any Multi-Arch: same Section: libs @@ -181,7 +182,7 @@ Description: VTK - Java language support Package: python3-vtk9 Architecture: any Section: python -Depends: libvtk9.1 (= ${binary:Version}), +Depends: libvtk9.2 (= ${binary:Version}), python3-mpi4py, ${misc:Depends}, ${python3:Depends}, @@ -202,7 +203,7 @@ Description: Python bindings for VTK Package: vtk9 Architecture: any Section: interpreters -Depends: libvtk9.1 (= ${binary:Version}), +Depends: libvtk9.2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Suggests: vtk9-doc, @@ -242,7 +243,7 @@ Description: VTK examples . This package provides examples for VTK9 -Package: libvtk9.1-qt +Package: libvtk9.2-qt Architecture: any Multi-Arch: same Section: libs @@ -260,7 +261,7 @@ Architecture: any Multi-Arch: same Section: libdevel Depends: libvtk9-dev (= ${binary:Version}), - libvtk9.1-qt (= ${binary:Version}), + libvtk9.2-qt (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, qtbase5-dev, diff --git a/debian/libvtk9-dev.install b/debian/libvtk9-dev.install index 0efd0a5d7..1cf1935f4 100644 --- a/debian/libvtk9-dev.install +++ b/debian/libvtk9-dev.install @@ -1,3 +1,3 @@ -usr/include/vtk-9.1 usr/include +usr/include/vtk-9.2 usr/include usr/lib/*/*.so -usr/lib/*/cmake/vtk-9.1 +usr/lib/*/cmake/vtk-9.2 diff --git a/debian/libvtk9-doc.docs b/debian/libvtk9-doc.docs index 8d0303d0b..b8980727a 100644 --- a/debian/libvtk9-doc.docs +++ b/debian/libvtk9-doc.docs @@ -1 +1 @@ -usr/share/doc/vtk-9.1/doxygen/* /usr/share/vtk-9.1/doxygen/ +usr/share/doc/vtk-9.2/doxygen/* /usr/share/vtk-9.2/doxygen/ diff --git a/debian/libvtk9-java.install b/debian/libvtk9-java.install index a0e7f6091..e427d25f0 100644 --- a/debian/libvtk9-java.install +++ b/debian/libvtk9-java.install @@ -1,4 +1,4 @@ -usr/bin/vtkParseJava-9.1 usr/bin -usr/bin/vtkWrapJava-9.1 usr/bin +usr/bin/vtkParseJava-9.2 usr/bin +usr/bin/vtkWrapJava-9.2 usr/bin usr/lib/*/java/vtk9.jar usr/share/java usr/lib/*/java/vtk-L* diff --git a/debian/libvtk9-qt-dev.install b/debian/libvtk9-qt-dev.install index 0654fa61d..c1783723c 100644 --- a/debian/libvtk9-qt-dev.install +++ b/debian/libvtk9-qt-dev.install @@ -1,3 +1,3 @@ usr/lib/*/*Qt*.so -usr/include/vtk-9.1/*Qt* -usr/include/vtk-9.1/Q* +usr/include/vtk-9.2/*Qt* +usr/include/vtk-9.2/Q* diff --git a/debian/libvtk9.1-qt.lintian-overrides b/debian/libvtk9.1-qt.lintian-overrides deleted file mode 100644 index 519358004..000000000 --- a/debian/libvtk9.1-qt.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libvtk9.1-qt: package-name-doesnt-match-sonames diff --git a/debian/libvtk9.1.install b/debian/libvtk9.1.install deleted file mode 100644 index 47de4b07a..000000000 --- a/debian/libvtk9.1.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*/*.so.* -usr/lib/*/vtk diff --git a/debian/libvtk9.1.lintian-overrides b/debian/libvtk9.1.lintian-overrides deleted file mode 100644 index 455cb156e..000000000 --- a/debian/libvtk9.1.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libvtk9.1: package-name-doesnt-match-sonames diff --git a/debian/libvtk9.1-qt.install b/debian/libvtk9.2-qt.install similarity index 100% rename from debian/libvtk9.1-qt.install rename to debian/libvtk9.2-qt.install diff --git a/debian/libvtk9.2-qt.lintian-overrides b/debian/libvtk9.2-qt.lintian-overrides new file mode 100644 index 000000000..f0c49964e --- /dev/null +++ b/debian/libvtk9.2-qt.lintian-overrides @@ -0,0 +1 @@ +libvtk9.2-qt: package-name-doesnt-match-sonames diff --git a/debian/libvtk9.2.install b/debian/libvtk9.2.install new file mode 100644 index 000000000..048f513db --- /dev/null +++ b/debian/libvtk9.2.install @@ -0,0 +1,2 @@ +usr/lib/*/*.so.* +usr/lib/*/vtk-9.2 diff --git a/debian/libvtk9.2.lintian-overrides b/debian/libvtk9.2.lintian-overrides new file mode 100644 index 000000000..56350323d --- /dev/null +++ b/debian/libvtk9.2.lintian-overrides @@ -0,0 +1 @@ +libvtk9.2: package-name-doesnt-match-sonames diff --git a/debian/patches/10_matplotlib.patch b/debian/patches/10_matplotlib.patch index c7e78fb47..bdfbb09a7 100644 --- a/debian/patches/10_matplotlib.patch +++ b/debian/patches/10_matplotlib.patch @@ -1,9 +1,9 @@ Description: _matplotlib -Index: VTK-9.1.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h +Index: VTK-9.2.5/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h =================================================================== ---- VTK-9.1.0.orig/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h -+++ VTK-9.1.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h -@@ -197,6 +197,10 @@ private: +--- VTK-9.2.5.orig/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h ++++ VTK-9.2.5/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h +@@ -199,6 +199,10 @@ private: * to implement IsAvailable. */ static Availability CheckMPLAvailability(); diff --git a/debian/patches/110_vtk9_netcdf.patch b/debian/patches/110_vtk9_netcdf.patch index 888225e2b..2a5cb14eb 100644 --- a/debian/patches/110_vtk9_netcdf.patch +++ b/debian/patches/110_vtk9_netcdf.patch @@ -3,14 +3,3 @@ Author: Anton Gladky Bug-Debian: https://bugs.debian.org/1012703 Last-Update: 2022-06-19 ---- vtk9-9.1.0+really9.1.0+dfsg2.orig/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c -+++ vtk9-9.1.0+really9.1.0+dfsg2/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c -@@ -1770,7 +1770,7 @@ void ex__compress_variable(int exoid, in - */ - - /* const int NC_SZIP_EC = 4; */ /* Selects entropy coding method for szip. */ -- const int NC_SZIP_NN = 32; /* Selects nearest neighbor coding method for szip. */ -+ // const int NC_SZIP_NN = 32; /* Selects nearest neighbor coding method for szip. */ - /* Even and between 4 and 32; typical values are 8, 10, 16, 32 */ - const int SZIP_PIXELS_PER_BLOCK = - file->compression_level == 0 ? 32 : file->compression_level; diff --git a/debian/patches/120_fix_shader_crash.patch b/debian/patches/120_fix_shader_crash.patch deleted file mode 100644 index 69c3f6bb8..000000000 --- a/debian/patches/120_fix_shader_crash.patch +++ /dev/null @@ -1,163 +0,0 @@ -commit bc4d0fec4f791fb198ff316849aaf3faba24b45a -Author: Gaspard Thevenon -Date: Thu Feb 10 10:19:39 2022 +0100 - - Fix shader crash in Multi Volume Rendering without GradientTF - - When using OpenGLGPUVolumeRayCastMapper with a MultiVolume, - not specifying a gradient opacity TF produced an error in - the composed shader (no argument would be given to functions which expected one), - and nothing was rendered, although this TF is supposed to be optional. - - This commit fixes this by adding tests during the declarations of - those functions inside the shader, and by changing their signatures as needed. - Therefore, when no gradient opacity TF is given, no argument is expected - and none is given. - -diff --git a/Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.cxx b/Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.cxx -index cdcec460ef..dfc65de04b 100644 ---- a/Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.cxx -+++ b/Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.cxx -@@ -2415,7 +2415,8 @@ void vtkOpenGLGPUVolumeRayCastMapper::ReplaceShaderCompute( - vtkvolume::ComputeGradientOpacityMulti1DDecl(this->AssembledInputs)); - - vtkShaderProgram::Substitute(fragmentShader, "//VTK::ComputeColor::Dec", -- vtkvolume::ComputeColorMultiDeclaration(this->AssembledInputs)); -+ vtkvolume::ComputeColorMultiDeclaration( -+ this->AssembledInputs, vol->GetProperty()->HasGradientOpacity())); - - vtkShaderProgram::Substitute(fragmentShader, "//VTK::ComputeLighting::Dec", - vtkvolume::ComputeLightingMultiDeclaration(ren, this, vol, numComps, independentComponents, -@@ -2970,6 +2971,23 @@ bool vtkOpenGLGPUVolumeRayCastMapper::vtkInternal::UpdateInputs(vtkRenderer* ren - this->ForceTransferInit(); - } - -+ if (this->MultiVolume) -+ { -+ bool hasGradient = this->Parent->AssembledInputs[0].Volume->GetProperty()->HasGradientOpacity(); -+ for (auto& item : this->Parent->AssembledInputs) -+ { -+ if (item.second.Volume->GetProperty()->HasGradientOpacity() != hasGradient) -+ { -+ vtkGenericWarningMacro( -+ "Current implentation of vtkOpenGLGPUVolumeRayCastMapper does not support MultiVolume " -+ "where some volumes have a gradient opacity function and some others don't. " -+ "Rendering of the MultiVolume is disabled."); -+ success = false; -+ break; -+ } -+ } -+ } -+ - return success; - } - -@@ -3106,7 +3124,10 @@ void vtkOpenGLGPUVolumeRayCastMapper::GPURender(vtkRenderer* ren, vtkVolume* vol - this->Impl->MultiVolume = multiVol && this->GetInputCount() > 1 ? multiVol : nullptr; - - this->Impl->ClearRemovedInputs(renWin); -- this->Impl->UpdateInputs(ren, vol); -+ if (!this->Impl->UpdateInputs(ren, vol)) -+ { -+ return; -+ } - this->Impl->UpdateSamplingDistance(ren); - this->Impl->UpdateTransfer2DYAxisArray(ren, vol); - this->Impl->UpdateTransferFunctions(ren); -diff --git a/Rendering/VolumeOpenGL2/vtkVolumeShaderComposer.h b/Rendering/VolumeOpenGL2/vtkVolumeShaderComposer.h -index 766f36ab63..3406bfb431 100644 ---- a/Rendering/VolumeOpenGL2/vtkVolumeShaderComposer.h -+++ b/Rendering/VolumeOpenGL2/vtkVolumeShaderComposer.h -@@ -1054,10 +1054,24 @@ std::string ComputeLightingMultiDeclaration(vtkRenderer* vtkNotUsed(ren), vtkVol - int lightingComplexity) - { - vtkVolumeProperty* volProperty = vol->GetProperty(); -- std::string shaderStr = std::string("\ -+ -+ std::string shaderStr = std::string(); -+ -+ // if no gradient TF is needed, don't add it into the function signature -+ if (volProperty->HasGradientOpacity()) -+ { -+ shaderStr += std::string("\ - \nvec4 computeLighting(vec3 texPos, vec4 color, const in sampler2D gradientTF, const in sampler3D volume, const int volIdx, int component)\ - \n {\ - \n vec4 finalColor = vec4(0.0);"); -+ } -+ else -+ { -+ shaderStr += std::string("\ -+ \nvec4 computeLighting(vec3 texPos, vec4 color, const in sampler3D volume, const int volIdx, int component)\ -+ \n {\ -+ \n vec4 finalColor = vec4(0.0);"); -+ } - - // Shading for composite blending only - int const shadeReqd = volProperty->GetShade() && -@@ -1243,7 +1257,8 @@ std::string ComputeColorDeclaration(vtkRenderer* vtkNotUsed(ren), - } - - //-------------------------------------------------------------------------- --std::string ComputeColorMultiDeclaration(vtkOpenGLGPUVolumeRayCastMapper::VolumeInputMap& inputs) -+std::string ComputeColorMultiDeclaration( -+ vtkOpenGLGPUVolumeRayCastMapper::VolumeInputMap& inputs, bool useGradientTF) - { - std::ostringstream ss; - int i = 0; -@@ -1274,13 +1289,28 @@ std::string ComputeColorMultiDeclaration(vtkOpenGLGPUVolumeRayCastMapper::Volume - } - else - { -- ss << "vec4 computeColor(vec3 texPos, vec4 scalar, float opacity, const in sampler2D colorTF, " -- "const in sampler2D gradientTF, const in sampler3D volume, const int volIdx)\n" -- "{\n" -- " return clamp(computeLighting(texPos, vec4(texture2D(colorTF,\n" -- " vec2(scalar.w, 0.0)).xyz, opacity), gradientTF, volume, " -- "volIdx, 0), 0.0, 1.0);\n" -- "}\n"; -+ if (useGradientTF) -+ { -+ ss -+ << "vec4 computeColor(vec3 texPos, vec4 scalar, float opacity, const in sampler2D colorTF, " -+ "const in sampler2D gradientTF, const in sampler3D volume, const int volIdx)\n" -+ "{\n" -+ " return clamp(computeLighting(texPos, vec4(texture2D(colorTF,\n" -+ " vec2(scalar.w, 0.0)).xyz, opacity), gradientTF, volume, " -+ "volIdx, 0), 0.0, 1.0);\n" -+ "}\n"; -+ } -+ else -+ { -+ ss -+ << "vec4 computeColor(vec3 texPos, vec4 scalar, float opacity, const in sampler2D colorTF, " -+ "const in sampler3D volume, const int volIdx)\n" -+ "{\n" -+ " return clamp(computeLighting(texPos, vec4(texture2D(colorTF,\n" -+ " vec2(scalar.w, 0.0)).xyz, opacity), volume, " -+ "volIdx, 0), 0.0, 1.0);\n" -+ "}\n"; -+ } - } - - return ss.str(); -@@ -1828,14 +1858,18 @@ std::string ShadingMultipleInputs( - - if (property->GetTransferFunctionMode() == vtkVolumeProperty::TF_1D) - { -+ std::string gradientopacity_param = (property->HasGradientOpacity()) -+ ? input.GradientOpacityTablesMap[0] + std::string(", ") -+ : std::string(); -+ - toShaderStr << " g_srcColor.a = computeOpacity(scalar," - << input.OpacityTablesMap[0] - << ");\n" - " if (g_srcColor.a > 0.0)\n" - " {\n" - " g_srcColor = computeColor(texPos, scalar, g_srcColor.a, " -- << input.RGBTablesMap[0] << ", " << input.GradientOpacityTablesMap[0] << ", " -- << "in_volume[" << i << "], " << i << ");\n"; -+ << input.RGBTablesMap[0] << ", " << gradientopacity_param << "in_volume[" << i -+ << "], " << i << ");\n"; - - if (property->HasGradientOpacity()) - { diff --git a/debian/patches/20_do_not_link_against_socket.patch b/debian/patches/20_do_not_link_against_socket.patch index 8b4e89f98..87bd61a7b 100644 --- a/debian/patches/20_do_not_link_against_socket.patch +++ b/debian/patches/20_do_not_link_against_socket.patch @@ -1,9 +1,9 @@ Description: Do not try linking with -lsocket -Index: VTK-9.0.1/Common/System/vtkTestSocketFeatures.cmake +Index: VTK-9.2.5/Common/System/vtkTestSocketFeatures.cmake =================================================================== ---- VTK-9.0.1.orig/Common/System/vtkTestSocketFeatures.cmake -+++ VTK-9.0.1/Common/System/vtkTestSocketFeatures.cmake +--- VTK-9.2.5.orig/Common/System/vtkTestSocketFeatures.cmake ++++ VTK-9.2.5/Common/System/vtkTestSocketFeatures.cmake @@ -6,9 +6,6 @@ check_library_exists("socket" getsocknam if(NOT DEFINED VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T) diff --git a/debian/patches/30_drop_medical_example.patch b/debian/patches/30_drop_medical_example.patch index 3b2a8871c..e95bc66ed 100644 --- a/debian/patches/30_drop_medical_example.patch +++ b/debian/patches/30_drop_medical_example.patch @@ -1,9 +1,11 @@ Description: Drop medical examples Last-Update: 2020-10-21 ---- vtk9-9.0.1+dfsg1.orig/Examples/CMakeLists.txt -+++ vtk9-9.0.1+dfsg1/Examples/CMakeLists.txt -@@ -55,7 +55,7 @@ else () +Index: VTK-9.2.5/Examples/CMakeLists.txt +=================================================================== +--- VTK-9.2.5.orig/Examples/CMakeLists.txt ++++ VTK-9.2.5/Examples/CMakeLists.txt +@@ -56,7 +56,7 @@ else () add_example(IO/Cxx) add_example(ImageProcessing/Cxx) add_example(Infovis/Cxx) diff --git a/debian/patches/40_vtkpython-9.patch b/debian/patches/40_vtkpython-9.patch index 68a950c46..e09b28361 100644 --- a/debian/patches/40_vtkpython-9.patch +++ b/debian/patches/40_vtkpython-9.patch @@ -2,10 +2,10 @@ Description: Rename vtkpython to vtkpython-9.0 Author: Anton Gladky Last-Update: 2020-11-05 -Index: vtk9-9.0.1+dfsg1/Wrapping/Python/CMakeLists.txt +Index: VTK-9.2.5/Wrapping/Python/CMakeLists.txt =================================================================== ---- vtk9-9.0.1+dfsg1.orig/Wrapping/Python/CMakeLists.txt -+++ vtk9-9.0.1+dfsg1/Wrapping/Python/CMakeLists.txt +--- VTK-9.2.5.orig/Wrapping/Python/CMakeLists.txt ++++ VTK-9.2.5/Wrapping/Python/CMakeLists.txt @@ -23,21 +23,21 @@ endif () # The interpreters are not supported in wheel builds, so skip them. diff --git a/debian/patches/50_fix_python-modules_path.patch b/debian/patches/50_fix_python-modules_path.patch index 61e6fc98c..1114f017f 100644 --- a/debian/patches/50_fix_python-modules_path.patch +++ b/debian/patches/50_fix_python-modules_path.patch @@ -2,11 +2,11 @@ Description: Fix path for the installation of python modules Author: Anton Gladky Last-Update: 2020-11-06 -Index: vtk9-9.0.1+dfsg1/CMake/vtkModuleWrapPython.cmake +Index: VTK-9.2.5/CMake/vtkModuleWrapPython.cmake =================================================================== ---- vtk9-9.0.1+dfsg1.orig/CMake/vtkModuleWrapPython.cmake -+++ vtk9-9.0.1+dfsg1/CMake/vtkModuleWrapPython.cmake -@@ -84,7 +84,7 @@ function (vtk_module_python_default_dest +--- VTK-9.2.5.orig/CMake/vtkModuleWrapPython.cmake ++++ VTK-9.2.5/CMake/vtkModuleWrapPython.cmake +@@ -87,7 +87,7 @@ function (vtk_module_python_default_dest "for Python modules.") set(_vtk_python_version_suffix) endif () @@ -15,11 +15,11 @@ Index: vtk9-9.0.1+dfsg1/CMake/vtkModuleWrapPython.cmake endif () set("${var}" "${destination}" PARENT_SCOPE) -Index: vtk9-9.0.1+dfsg1/Utilities/Python/CMakeLists.txt +Index: VTK-9.2.5/Utilities/Python/CMakeLists.txt =================================================================== ---- vtk9-9.0.1+dfsg1.orig/Utilities/Python/CMakeLists.txt -+++ vtk9-9.0.1+dfsg1/Utilities/Python/CMakeLists.txt -@@ -77,7 +77,7 @@ if (NOT VTK_PYTHON_SITE_PACKAGES_SUFFIX) +--- VTK-9.2.5.orig/Utilities/Python/CMakeLists.txt ++++ VTK-9.2.5/Utilities/Python/CMakeLists.txt +@@ -85,7 +85,7 @@ if (NOT VTK_PYTHON_SITE_PACKAGES_SUFFIX) set(VTK_PYTHON_SITE_PACKAGES_SUFFIX "Lib/site-packages") else () set(VTK_PYTHON_SITE_PACKAGES_SUFFIX diff --git a/debian/patches/60_fix_path_perl.patch b/debian/patches/60_fix_path_perl.patch index cd69a5dbc..c6c9b0a34 100644 --- a/debian/patches/60_fix_path_perl.patch +++ b/debian/patches/60_fix_path_perl.patch @@ -2,48 +2,60 @@ Description: Fix shebang for the perl scripts Author: Anton Gladky Last-Update: 2020-11-08 ---- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_class2example.pl -+++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_class2example.pl +Index: VTK-9.2.5/Utilities/Doxygen/doc_class2example.pl +=================================================================== +--- VTK-9.2.5.orig/Utilities/Doxygen/doc_class2example.pl ++++ VTK-9.2.5/Utilities/Doxygen/doc_class2example.pl @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl # Time-stamp: <2004-06-09 11:12:38 barre> # # Build cross-references between classes and examples ---- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_cleanhtml.pl -+++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_cleanhtml.pl +Index: VTK-9.2.5/Utilities/Doxygen/doc_cleanhtml.pl +=================================================================== +--- VTK-9.2.5.orig/Utilities/Doxygen/doc_cleanhtml.pl ++++ VTK-9.2.5/Utilities/Doxygen/doc_cleanhtml.pl @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl # Time-stamp: <2002-10-25 20:17:59 barre> # # Clean the HTML generated by Doxygen to remove some layout quicks ---- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_codematch.pl -+++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_codematch.pl +Index: VTK-9.2.5/Utilities/Doxygen/doc_codematch.pl +=================================================================== +--- VTK-9.2.5.orig/Utilities/Doxygen/doc_codematch.pl ++++ VTK-9.2.5/Utilities/Doxygen/doc_codematch.pl @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl # Time-stamp: <2002-01-18 16:17:26 barre> # # Summary ? ---- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_index.pl -+++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_index.pl +Index: VTK-9.2.5/Utilities/Doxygen/doc_index.pl +=================================================================== +--- VTK-9.2.5.orig/Utilities/Doxygen/doc_index.pl ++++ VTK-9.2.5/Utilities/Doxygen/doc_index.pl @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl # Time-stamp: <2001-11-21 17:40:48 barre> # # Build full-text index ---- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_rmpath.pl -+++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_rmpath.pl +Index: VTK-9.2.5/Utilities/Doxygen/doc_rmpath.pl +=================================================================== +--- VTK-9.2.5.orig/Utilities/Doxygen/doc_rmpath.pl ++++ VTK-9.2.5/Utilities/Doxygen/doc_rmpath.pl @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl # Time-stamp: <2001-10-05 11:49:40 barre> # # Remove path to intermediate Doxygen dir from html doc ---- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_version.pl -+++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_version.pl +Index: VTK-9.2.5/Utilities/Doxygen/doc_version.pl +=================================================================== +--- VTK-9.2.5.orig/Utilities/Doxygen/doc_version.pl ++++ VTK-9.2.5/Utilities/Doxygen/doc_version.pl @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl diff --git a/debian/patches/83_allow_gles_platforms.patch b/debian/patches/83_allow_gles_platforms.patch index e08f7a41d..375bc7bbb 100644 --- a/debian/patches/83_allow_gles_platforms.patch +++ b/debian/patches/83_allow_gles_platforms.patch @@ -8,11 +8,11 @@ Date: Fri, 11 Dec 2020 10:42:37 +0200 GUISupport/Qt/QVTKOpenGLWindow.cxx | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/GUISupport/Qt/QVTKOpenGLWindow.cxx b/GUISupport/Qt/QVTKOpenGLWindow.cxx -index 3bddc19809..79d5c2b653 100644 ---- a/GUISupport/Qt/QVTKOpenGLWindow.cxx -+++ b/GUISupport/Qt/QVTKOpenGLWindow.cxx -@@ -35,6 +35,11 @@ +Index: VTK-9.2.5/GUISupport/Qt/QVTKOpenGLWindow.cxx +=================================================================== +--- VTK-9.2.5.orig/GUISupport/Qt/QVTKOpenGLWindow.cxx ++++ VTK-9.2.5/GUISupport/Qt/QVTKOpenGLWindow.cxx +@@ -34,6 +34,11 @@ #include "vtkObjectFactory.h" #include "vtkOpenGLState.h" @@ -24,6 +24,3 @@ index 3bddc19809..79d5c2b653 100644 QVTKOpenGLWindow::QVTKOpenGLWindow(QOpenGLWindow::UpdateBehavior ub, QWindow* p) : QVTKOpenGLWindow(vtkSmartPointer::New(), nullptr, ub, p) { --- -2.20.1 - diff --git a/debian/patches/84_vtkQWidgetTexture_no_vtkOpenGLCheckErrorMacro.patch b/debian/patches/84_vtkQWidgetTexture_no_vtkOpenGLCheckErrorMacro.patch index 0744d41ee..21121325b 100644 --- a/debian/patches/84_vtkQWidgetTexture_no_vtkOpenGLCheckErrorMacro.patch +++ b/debian/patches/84_vtkQWidgetTexture_no_vtkOpenGLCheckErrorMacro.patch @@ -2,8 +2,10 @@ Description: HACK: vtkQWidgetTexture.cxx: Don't use vtkOpenGLCheckErrorMacro Fixes building for Qt with OpenGL ES. Author: Adrian Bunk ---- vtk9-9.1.0+dfsg2.orig/GUISupport/Qt/vtkQWidgetTexture.cxx -+++ vtk9-9.1.0+dfsg2/GUISupport/Qt/vtkQWidgetTexture.cxx +Index: VTK-9.2.5/GUISupport/Qt/vtkQWidgetTexture.cxx +=================================================================== +--- VTK-9.2.5.orig/GUISupport/Qt/vtkQWidgetTexture.cxx ++++ VTK-9.2.5/GUISupport/Qt/vtkQWidgetTexture.cxx @@ -18,7 +18,7 @@ #include "vtkOpenGLResourceFreeCallback.h" #include "vtkOpenGLState.h" diff --git a/debian/patches/95_java_mach-arch_fix.patch b/debian/patches/95_java_mach-arch_fix.patch index a30212502..73119c26c 100644 --- a/debian/patches/95_java_mach-arch_fix.patch +++ b/debian/patches/95_java_mach-arch_fix.patch @@ -9,11 +9,11 @@ Subject: [PATCH] Fix build on mach-based OS which are not OS X include/diy/time.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp b/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp -index 692cf36..671e69d 100644 ---- a/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp -+++ b/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp -@@ -3,11 +3,11 @@ +Index: VTK-9.2.5/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp +=================================================================== +--- VTK-9.2.5.orig/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp ++++ VTK-9.2.5/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp +@@ -3,10 +3,10 @@ #ifndef _WIN32 #include @@ -26,8 +26,7 @@ index 692cf36..671e69d 100644 #endif // ifndef _WIN32 namespace diy - { -@@ -16,7 +16,7 @@ typedef unsigned long time_type; +@@ -16,7 +16,7 @@ typedef unsigned long time_typ inline time_type get_time() { @@ -36,5 +35,3 @@ index 692cf36..671e69d 100644 clock_serv_t cclock; mach_timespec_t ts; host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock); --- -GitLab diff --git a/debian/patches/97_reproducible_builds.patch b/debian/patches/97_reproducible_builds.patch index 46c71684b..09affe088 100644 --- a/debian/patches/97_reproducible_builds.patch +++ b/debian/patches/97_reproducible_builds.patch @@ -8,10 +8,10 @@ Thanks to Bernhard M. Wiedemann . Utilities/Doxygen/doc_class2example.pl | 1 + 1 file changed, 1 insertion(+) -diff --git a/Utilities/Doxygen/doc_class2example.pl b/Utilities/Doxygen/doc_class2example.pl -index 3978563..ce8aeca 100755 ---- a/Utilities/Doxygen/doc_class2example.pl -+++ b/Utilities/Doxygen/doc_class2example.pl +Index: VTK-9.2.5/Utilities/Doxygen/doc_class2example.pl +=================================================================== +--- VTK-9.2.5.orig/Utilities/Doxygen/doc_class2example.pl ++++ VTK-9.2.5/Utilities/Doxygen/doc_class2example.pl @@ -261,6 +261,7 @@ if (exists $args{"parser"}) { } else { @parsers = keys %parsers; @@ -20,7 +20,3 @@ index 3978563..ce8aeca 100755 my $os_is_win = ($^O =~ m/(MSWin32|Cygwin)/i); my $open_file_as_text = $os_is_win ? O_TEXT : 0; --- -2.29.2 - - diff --git a/debian/patches/98_fix_mpi4py.py b/debian/patches/98_fix_mpi4py.py index fefb4211d..c3fdfc35a 100644 --- a/debian/patches/98_fix_mpi4py.py +++ b/debian/patches/98_fix_mpi4py.py @@ -2,8 +2,10 @@ Description: Fix mpi4py search Author: Anton Gladky Last-Update: 2021-09-17 ---- vtk9-9.0.3+dfsg1.orig/Parallel/MPI4Py/vtk.module -+++ vtk9-9.0.3+dfsg1/Parallel/MPI4Py/vtk.module +Index: VTK-9.2.5/Parallel/MPI4Py/vtk.module +=================================================================== +--- VTK-9.2.5.orig/Parallel/MPI4Py/vtk.module ++++ VTK-9.2.5/Parallel/MPI4Py/vtk.module @@ -12,4 +12,3 @@ DEPENDS PRIVATE_DEPENDS VTK::ParallelMPI diff --git a/debian/patches/99_fix_ftbfs.patch b/debian/patches/99_fix_ftbfs.patch index 630b3ced1..fdf8a2c50 100644 --- a/debian/patches/99_fix_ftbfs.patch +++ b/debian/patches/99_fix_ftbfs.patch @@ -2,8 +2,10 @@ Description: Fix FTBFS Author: Anton Gladky Last-Update: 2021-11-14 ---- vtk9-9.1.0+dfsg1.orig/CMake/vtkCompilerExtraFlags.cmake -+++ vtk9-9.1.0+dfsg1/CMake/vtkCompilerExtraFlags.cmake +Index: VTK-9.2.5/CMake/vtkCompilerExtraFlags.cmake +=================================================================== +--- VTK-9.2.5.orig/CMake/vtkCompilerExtraFlags.cmake ++++ VTK-9.2.5/CMake/vtkCompilerExtraFlags.cmake @@ -3,7 +3,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) include(CheckCXXCompilerFlag) diff --git a/debian/patches/series b/debian/patches/series index 1efd5d331..133ce5087 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,5 +10,4 @@ 97_reproducible_builds.patch 98_fix_mpi4py.py 99_fix_ftbfs.patch -110_vtk9_netcdf.patch -120_fix_shader_crash.patch +#110_vtk9_netcdf.patch diff --git a/debian/python3-vtk9.install b/debian/python3-vtk9.install index 607890b3d..c27c0b17d 100644 --- a/debian/python3-vtk9.install +++ b/debian/python3-vtk9.install @@ -1,5 +1,5 @@ usr/lib/python3 usr/bin/pvtkpython usr/bin/vtkpython-9.0 -usr/bin/vtkWrapPython-9.1 -usr/bin/vtkWrapPythonInit-9.1 +usr/bin/vtkWrapPython-9.2 +usr/bin/vtkWrapPythonInit-9.2 diff --git a/debian/rules b/debian/rules index 4c693a59e..92c1d7827 100755 --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mips mipsel powerpc sh4)) export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed endif -notbb_archs=hurd-i386 kfreebsd-i386 kfreebsd-amd64 alpha ia64 +notbb_archs=hurd-i386 kfreebsd-i386 kfreebsd-amd64 ifneq ($(DEB_BUILD_ARCH),$(filter $(DEB_BUILD_ARCH), $(notbb_archs))) extra_flags += -DVTK_SMP_IMPLEMENTATION_TYPE:STRING="TBB" else @@ -98,14 +98,14 @@ ifneq ($(JAVA_HOME),) # Correct headers for paraview mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk.jar $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk9.jar endif - sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-9.1/VTK-targets.cmake + sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-9.2/VTK-targets.cmake execute_after_dh_install: rm -rf $(CURDIR)/debian/tmp/usr/share/licenses find $(CURDIR)/debian/libvtk9-dev/ -name "*Qt*" -exec rm {} \; || true find $(CURDIR)/debian/libvtk9-dev/ -name "libvtkRenderingPythonTkWidgets.so" -exec rm {} \; || true find $(CURDIR)/debian/libvtk9-dev/usr/include/ -name "Q*" -exec rm {} \; || true - find $(CURDIR)/debian/libvtk9.1/ -name "*Qt*" -exec rm {} \; || true + find $(CURDIR)/debian/libvtk9.2/ -name "*Qt*" -exec rm {} \; || true find $(CURDIR)/debian/tmp/usr/share/doc/vtk-9.0/doxygen -name "_formulas.log" -exec rm {} \; || true find $(CURDIR)/debian/build/Utilities/Doxygen/doc/html -name "_formulas.log" -exec rm {} \; || true diff --git a/debian/upstream/metadata b/debian/upstream/metadata index a1f856fd9..0618033da 100644 --- a/debian/upstream/metadata +++ b/debian/upstream/metadata @@ -1,6 +1,6 @@ Name: VTK -Bug-Database: https://gitlab.kitware.com/vtk/vtk/-/issues -Bug-Submit: https://gitlab.kitware.com/vtk/vtk/-/issues/new +Bug-Database: https://gitlab.kitware.com/vtk/vtk/issues +Bug-Submit: https://gitlab.kitware.com/vtk/vtk/issues/new Documentation: https://vtk.org/documentation/ Repository: https://gitlab.kitware.com/vtk/vtk.git Repository-Browse: https://gitlab.kitware.com/vtk/vtk diff --git a/debian/vtk9-doc.docs b/debian/vtk9-doc.docs index 3cdba6c33..ed82263a2 100644 --- a/debian/vtk9-doc.docs +++ b/debian/vtk9-doc.docs @@ -1,2 +1,2 @@ -debian/tmp/usr/share/doc/vtk-9.1/doxygen +debian/tmp/usr/share/doc/vtk-9.2/doxygen debian/build/Utilities/Doxygen/doc/html diff --git a/debian/vtk9.install b/debian/vtk9.install index c216fad72..ecd306bef 100644 --- a/debian/vtk9.install +++ b/debian/vtk9.install @@ -1,2 +1,2 @@ -usr/bin/vtkWrapHierarchy-9.1 -usr/bin/vtkProbeOpenGLVersion-9.1 +usr/bin/vtkWrapHierarchy-9.2 +usr/bin/vtkProbeOpenGLVersion-9.2 -- 2.30.2